bitkeeper revision 1.1236.59.2 (4252b4a1UliXnMSbhPVlbuo8WZ0wBw)

Remove superfluous ARCH_HAS_EXEC_DOMAIN_MM_PTR

diff --git a/xen/arch/ia64/patch/linux-2.6.7/setup.c b/xen/arch/ia64/patch/linux-2.6.7/setup.c
index 233c9d3575f180d143cfb21a5eeb5e565ad6bdf1..c35d18c058a8f5b7c43e0831f7828e6089c90267 100644 (file)
--- a/xen/arch/ia64/patch/linux-2.6.7/setup.c
+++ b/xen/arch/ia64/patch/linux-2.6.7/setup.c
@@ -1,5 +1,5 @@
 --- ../../linux-2.6.7/arch/ia64/kernel/setup.c 2004-06-15 23:18:58.000000000 -0600
-+++ arch/ia64/setup.c  2005-03-23 14:54:06.000000000 -0700
++++ arch/ia64/setup.c  2005-04-04 22:31:09.000000000 -0600
 @@ -21,6 +21,9 @@
  #include <linux/init.h>
  
@@ -180,7 +180,19 @@
        seq_printf(m,
                   "processor  : %d\n"
                   "vendor     : %s\n"
-@@ -667,6 +702,8 @@
+@@ -616,7 +651,11 @@
+                                       | IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
+       atomic_inc(&init_mm.mm_count);
+       current->active_mm = &init_mm;
++#ifdef XEN
++      if (current->domain->arch.mm)
++#else
+       if (current->mm)
++#endif
+               BUG();
+ 
+       ia64_mmu_init(ia64_imva(cpu_data));
+@@ -667,6 +706,8 @@
  void
  check_bugs (void)
  {

diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
index 41420b8ce0d2c2836afee53d6793fa913351f8ef..466e4ec629eb5ee7427bc3d62adaa690a8853160 100644 (file)
--- a/xen/arch/ia64/xensetup.c
+++ b/xen/arch/ia64/xensetup.c
@@ -258,7 +258,8 @@ printk("About to call do_createdomain()\n");
 printk("About to call init_idle_task()\n");
     init_task.domain = &idle0_domain;
     init_task.processor = 0;
-    init_task.mm = &init_mm;
+//    init_task.mm = &init_mm;
+    init_task.domain->arch.mm = &init_mm;
 //    init_task.thread = INIT_THREAD;
     init_idle_task();
     //arch_do_createdomain(current);

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 670b891f59617a85d1d1ca1508228ac91ff4a105..e8302a7245b2b85570de05dbb58839b0ffe54be7 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -68,10 +68,6 @@ struct exec_domain
     struct exec_domain *ed_next_list;
     int eid;
 
-#ifdef ARCH_HAS_EXEC_DOMAIN_MM_PTR
-    struct mm_struct *mm;
-#endif
-
     struct ac_timer  timer;         /* one-shot timer for timeout values */
     unsigned long    sleep_tick;    /* tick at which this vcpu started sleep */